rsync-ssl, testsuite: accept --type=SSL_TYPE anywhere in the args - #1047
Open
Zeno-sole wants to merge 3 commits into
Open
rsync-ssl, testsuite: accept --type=SSL_TYPE anywhere in the args#1047Zeno-sole wants to merge 3 commits into
Zeno-sole wants to merge 3 commits into
Conversation
Author
|
Before repair： After repair： |
Author
|
I would like to kindly request a code review from the upstream author/maintainer. @tridge |
Member
|
No need to ping after less then 24 hours. 1) a release has just been made with major security concerns, we are resting. 2) its been less then 24 hours :D Let's be respectful. "kindly" doesn't make something respectful. |
steadytao
requested changes
Aug 14, 2026
Zeno-sole
force-pushed
the
master
branch
2 times, most recently
from
August 17, 2026 11:24
5869381 to
44d374f
Compare
steadytao
requested changes
Aug 18, 2026
The --type=... option was only recognized as the first argument, so a command such as "rsync-ssl --dry-run --type=stunnel host::mod" passed the option through to the underlying rsync, which rejected it as unknown. Scan the full argument list for --type=..., export RSYNC_SSL_TYPE, and drop the option before handing the remaining args to rsync. The manpage no longer says the option must be first. Adds a test that runs rsync-ssl with a fake rsync in PATH and checks that --type= is consumed in first, middle, and last positions.
rsync-ssl consumed a --type=... operand that appeared after a -- argument, even though -- explicitly protects the rest of the command line from option parsing. Stop scanning for --type=... at a -- argument: preserve the -- and every subsequent argument verbatim, passing them through to rsync unchanged. Add regression coverage for this case and document the behavior in the manpage.
…tion test The rsync-ssl-type-option test only checked that --type= tokens were removed from the rsync argv, so it would also pass if the wrapper silently discarded the requested SSL implementation instead of exporting RSYNC_SSL_TYPE. The fake rsync now records both the argv it receives and the RSYNC_SSL_TYPE value it observes; each invocation asserts the expected value (or UNSET when the wrapper must not consume anything), and run() fails the test unless rsync-ssl exits successfully.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The --type=... option was only recognized as the first argument, so a command such as "rsync-ssl --dry-run --type=stunnel host::mod" passed the option through to the underlying rsync, which rejected it as unknown. Scan the full argument list for --type=..., export RSYNC_SSL_TYPE, and drop the option before handing the remaining args to rsync. The manpage no longer says the option must be first.
Adds a test that runs rsync-ssl with a fake rsync in PATH and checks that --type= is consumed in first, middle, and last positions.